Fixed some biiiig bugs.