Initial commit
fixing stuff