More improvements.. and bugs \:(