General updates, fixed (some) bugs.