Clean up code a bit; fix warnings; freeze dependencies for now