diff --git a/maps.py b/maps.py
index 5b54070..04eecd1 100644
--- a/maps.py
+++ b/maps.py
@@ -1,5 +1,6 @@
 import curses
 import math
+import threading
 from utils import CHUNK_HEIGHT, CHUNK_WIDTH, chunkx, chunky, inchunkx, inchunky, Position
 
 import sys
@@ -10,22 +11,33 @@ class Map():
 	Allows for user to modify chunks in an intuitive way.
 	"""
 	
-	def __init__(self, width, height, chunkpool):
+	def __init__(self, width, height, chunkpool, drawevent):
+		self._lock = threading.RLock()
+		
 		self.worldx = 0
 		self.worldy = 0
 		self.cursorx = 0
 		self.cursory = 0
 		self.chunkpreload = 0
+		self.cursorpadding = 2
 		
 		self.chunkpool = chunkpool
+		self.drawevent = drawevent
 		
 		self._pad = curses.newpad(5, 5)
 		self.resize(width, height)
 	
+	def __enter__(self):
+		self._lock.acquire()
+		return self
+	
+	def __exit__(self, type, value, tb):
+		self._lock.release()
+	
 	def draw(self):
 		with self.chunkpool as pool:
-			for x in range(chunkx(self.width) + 1):
-				for y in range(chunky(self.height) + 1):
+			for x in range(chunkx(self.width) + 2):      # +2, not +1, or there will be empty gaps
+				for y in range(chunky(self.height) + 2): # in the bottom and right borders
 					chunk = pool.get(x+chunkx(self.worldx), y+chunky(self.worldy))
 					if chunk:
 						chunk.draw_to(x*CHUNK_WIDTH, y*CHUNK_HEIGHT, self._pad)
@@ -42,12 +54,12 @@ class Map():
 	
 	def draw_empty_to(self, x, y):
 		if curses.has_colors():
-			curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_WHITE)
+			curses.init_pair(1, curses.COLOR_BLACK, curses.COLOR_WHITE)
 			for dy in range(CHUNK_HEIGHT):
 				self._pad.addstr(y+dy, x, " "*CHUNK_WIDTH, curses.color_pair(1))
 		else:
 			for dy in range(CHUNK_HEIGHT):
-				s = "."*(CHUNK_WIDTH)
+				s = "."*CHUNK_WIDTH
 				self._pad.addstr(y+dy, x, s)
 	
 	def resize(self, width, height):
@@ -55,12 +67,14 @@ class Map():
 		self.height = height
 		
 		self._pad.resize(
-			(chunky(height) + 1)*CHUNK_HEIGHT,
-			(chunkx(width) + 1)*CHUNK_WIDTH + 1 # workaround for addwstr issue when drawing
+			(chunky(height) + 2)*CHUNK_HEIGHT,
+			(chunkx(width) + 2)*CHUNK_WIDTH + 1 # workaround for addwstr issue when drawing
 		)
 		
 		with self.chunkpool as pool:
 			pool.load_list(self.visible_chunk_coords())
+		
+		self.drawevent.set()
 	
 	def visible_chunk_coords(self):
 		coords = []
@@ -80,10 +94,54 @@ class Map():
 		pass
 	
 	def move_cursor(self, dx, dy):
-		pass
+		self.cursorx += dx
+		self.cursory += dy
+		
+		self.worldx = min(
+			self.cursorx - self.cursorpadding,
+			max(
+				self.cursorx - self.width+1 + self.cursorpadding,
+				self.worldx
+			)
+		)
+		
+		self.worldy = min(
+			self.cursory - self.cursorpadding,
+			max(
+				self.cursory - self.height+1 + self.cursorpadding,
+				self.worldy
+			)
+		)
+		
+		self.drawevent.set()
 	
 	def scroll(self, dx, dy):
-		pass
+		self.worldx += dx
+		self.worldy += dy
+		
+		# new scrolling code: The cursor stays on the same screen position while scrolling
+		self.cursorx += dx
+		self.cursory += dy
+		
+		# old scrolling code: The cursor would stay on the same world coordinates while scrolling,
+		# and only if it was at the edge of the screen, it would get carried with the window.
+		#self.cursorx = min(
+			#self.worldx + self.width-1 - self.cursorpadding,
+			#max(
+				#self.worldx + self.cursorpadding,
+				#self.cursorx
+			#)
+		#)
+		
+		#self.cursory = min(
+			#self.worldy + self.height-1 - self.cursorpadding,
+			#max(
+				#self.worldy + self.cursorpadding,
+				#self.cursory
+			#)
+		#)
+		
+		self.drawevent.set()
 	
 
 class ChunkMap():
diff --git a/utils.py b/utils.py
index 8e754f8..8083e21 100644
--- a/utils.py
+++ b/utils.py
@@ -12,7 +12,7 @@ def chunky(value):
 	return value//CHUNK_HEIGHT
 
 def inchunkx(value):
-	return value%CHUNK_HEIGHT
+	return value%CHUNK_WIDTH
 
 def inchunky(value):
-	return value%CHUNK_WIDTH
+	return value%CHUNK_HEIGHT