Some TODO cleanup, bugfixes and cursor layer offsets.