A couple bug fixes, New stuff coming soon