Some cleanup, seems beta-ready now