Fix bugs and shit