Fixed some bugs, started doing overlay support