first fixes to get this shit working