Cleaned up even more, and bed time