v. 0.4b

Major cleanups and fixed. Note! None of this changes are included into
the distro build yet, because I'm avaiting to finish the selector engine
part.