final fixes and features for today, see you guys tomorrow! :D