Damnlol bug fixes and ui bits