Initial Commit
bug fixes