More features, bugs fixed