Removed mess
Fixed some bugs and added init callbacks.