Fixed a few bugs, still broken